projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81bf47d 5c74609)
bitkeeper revision 1.1159.1.553 (420919acSbg0z7dds_B0PhykDN6vYA)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 8 Feb 2005 19:57:32 +0000 (19:57 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 8 Feb 2005 19:57:32 +0000 (19:57 +0000)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
xen/arch/x86/mm.c patch | diff1 | diff2 | blob | history

diff --cc xen/arch/x86/mm.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.